Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 24 May 2010 22:47:09 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 24 May 2010 22:47:09 +0000 (22:47 +0000)

Trivial merge